Merge branch 'release/0.0.12' into develop
nose test assumes any function with 'test' in the name is a test.  We had to rename some of our methods
Merge branch 'release/0.0.17'