Rename 'User' (the user's account) to Account, and move trait out of
the sql package. Also remove some tech debt in the form of old debug
code and some warnings that came in with Scala 2.10.
Merge branch 'master' into portal_integration