Merge pull request #3 from cbarcroft/ChrisB

Chris b
style stuff
Merge branch 'master' of github.com:cbarcroft/Sentrino into chrisdfe
Changed models
Merge pull request #4 from cbarcroft/chrisdfe

Chrisdfe
playing?
Merge branch 'master' into ChrisB