Index module in stabdard format. Need to refactor indexing.
Added .DS_store to gitignore to support OS X
Merge branch 'master' into merged