Updated files due to error in Capstrano deployment
Merge branch 'capistrano'