Merge pull request #85 from murrekatt/develop

Running unit tests with Travis and cleanup of version and Travis file.