fixed current_user issues
Merge branch 'master' of github.com:alexpien/hackduke2013