triggering travis
Merge branch 'master' of github.com:BoiseFED/device-registry