Added controllers and fixed db setup.
Various changes during whole site refactoring; working on user signups etc right now.
Merge branch 'master' into local
Merge branch 'local'