Minor changes to make travis pass.

Also some fixes to minor linting issues.
Merge pull request #37 from cloudspace/trying_to_get_travis_working

Minor changes to make travis pass.