Merge branch 'cleanup_index' into 'master'

src/Makefile.am

src/cache.hpp

src/index_file.hpp

src/openmp.cpp

src/openmp.hpp

src/reader.cpp