Merge branch 'hotfix/css-images'
Setup zeus
Remove extra comma in routes
Swap maptastic plugin with more recent fork
Convert yml syntax
Upgrade a bunch of gems and set ruby 2.0.0 as version
New formtastic syntax
New ckeditor syntax
Update rails config for 3.2.x
Comment out old devise config
CKEditor engine
Comment out assets rake tasks
Add encrypted password field for user model
Convert to new sunspot syntax
Use new asset helper methods in layouts
Refactor spedc for manual article lists controller
Ruby version 2.0.0
Don't interpret asset paths as slugs
Move images into correct assets folder
Move javascript and stylesheets into assets folder