Merge branch 'dev'
production modifications
added asset caching for production
capistrano tweak
updated railsenv task