oops on requirements.txt
merging latest

Merge branch 'master' of github.com:sociam/indx
changed install param
merging in from emax

Merge branch 'emax'
gitignore
master

Merge branch 'master' into emax