Merge branch 'master' of github.com:JoeyEremondi/haskelm
Updated README, travis file