Merge pull request #38 from Noahhh/master

Merged greg's trimming of JS tag file/population of tags with me and pushing it up.
fixed users controller merge problems