Merge pull request #7 from rwwarren/dev

travis ci update
Merge pull request #8 from rwwarren/dev

Dev
Merge branch 'master' into dev