Merge branch 'clean_files'
Merge branch 'rails3.2.11_upgrade'
Merge branch 'master' of github.com:rdfrs/juvia
staging env configuration file
remove cloudfront for staging env
Merge branch 'staging_env'