Fix minor doc typo.
Merge branch 'master' of localhost:/opt/git/sima
Merge branch 'master' of localhost:/opt/git/sima
Setup support for develop
Merge branch 'master' of 156.111.43.151:/opt/git/sima
Removed compiled cython files
Adjustments to travis script