Fix Travis build
Merge pull request #3 from Southern/devel

Fix tests.
Merge pull request #4 from Southern/fix_travis

Fix Travis build
Add OSX to Travis testing