Style tweeks/cleaning up
Merge pull request #12 from cbarcroft/chrisb

Began tasks CRUD
Merged branches, resolved conflicts
Merge branch 'master' of https://github.com/cbarcroft/Sentrino
Finished task CRUD