Simplify user model (move authentication back to contour)
Removed reference to deprecated options_for_javascript
Updated to include newer version of aqueduct-mysql
Fixed test:models