Merge branch 'environment-variables' of github.com:professor/whiteboard
Merge branch 'master' of heroku.com:cmusv-shibboleth into rails3.1.12
precompiling
trying out replacing . to _
including new manifest
renamed all jquery_cookies
adding ckeditor/init to manifest
replaced all used javascript files containing a . with an _