Merge pull request #45 from simpeg/develop

Merge Develop into Master
Bug Fix
Merge branch 'develop' of https://github.com/simpeg/simpeg into develop