Merge pull request #2 from nylesb/hello-world

Hello world
Fixing Travis
Merge branch 'master' into hello-world