Style tweeks/cleaning up
Merged branches, resolved conflicts
Merge branch 'master' of https://github.com/cbarcroft/Sentrino