killed sprockets to match master
Merge branch 'master' into kyle
fixed a merge issue. up to date with master now
Merge branch 'sophana' into kyle
fixed buttons so they disappear when logged in and some angular organization
Merge branch 'kyle'