Merge pull request #27 from drincruz/master

merge down changes from master
manually putting the version
this will hopefully fix #28
Merge pull request #29 from drincruz/feature/fix_readthedocs

manually putting the version
Merge pull request #30 from drincruz/develop

Develop