Merge pull request #36 from murrekatt/develop

Added unit test baseline. Travis runs unit tests as part of build.