Remove the tab characters because vim is weird
update gems, change table on user, and database-y stuff.
Merge branch 'master' of git://github.com/WLCSC/firefight into upstream
prettify the CSS
prettify the application layout code
Revert "prettify the application layout code"

This reverts commit fd563a03d04139c7d7b57dede514c14a3e60e590.
Revert "Revert "prettify the application layout code""

This reverts commit feefd8fe8bb443f66e19e710d94deecb63e31c31.
moo
Merge branch 'master' of git://github.com/WLCSC/firefight into upstream
Merge branch 'upstream'
Merge pull request #1 from four04/master

Pull Request for 2013-06-06