Some style updates/fixes
Merge branch 'master' of github.com:cbarcroft/Sentrino