Merge pull request #14 from cbarcroft/chrisdfe

Chrisdfe
Merge pull request #15 from cbarcroft/chrisdfe

Chrisdfe
Fixed assocations on models, added automatic-action-registration upon creation of new device
Merge pull request #16 from cbarcroft/chrisdfe

Added some basic user authentication tests
Fixed tasks CRUD to use proper activerecord associations.  Had to drop the collection_select helper... not sure how to make that work with an .includes collection. Might restore later if I can figure that part out.
Merge branch 'master' of https://github.com/cbarcroft/Sentrino
Added some model validations, attempted setting timeouts on HTTParty to no avail.
Switched dev/test to postgresql
A bunch of minor tweaks to the style and UI functionality
Added basic image upload functionality