Merge branch 'master' into dev
Merge branch 'dev' of github.com:rwwarren/door-lock into dev
travis update
travis ci updates
Merge pull request #5 from rwwarren/dev

Dev