begin to build unit tests
fill in .travis.yml
Merge branch 'master' into dev
add tests, reformat code, tweak styling