Change to correct CamelCase here to be less confusing.
Fix pep8 and nosetest license issues.
Bump the version
Merge branch 'release/1.0.4' into develop