Merge pull request #12 from JoshuaNotowitz/master

removing module api
Merge pull request #13 from JoshuaNotowitz/master

PLEASE WORK now that i have saved=
Fix jsonbuilder paths
Merge branch 'master' of github.com:kourosh/tally
altered application controller protection
Merge branch 'master' of https://github.com/kourosh/tally
altered application controller
altered application controller again
altered application controller again againnnn
altered user controller
altered spa redirect
added password columns for user
added bcrypt
fixed user model
fixed user model again
took out location url on user create
Merge pull request #14 from ikitha/master

Working on token authentication process
Change font on SPA
Merge branch 'master' of github.com:kourosh/tally
Change routes to re-enable events, pols in html