Upgraded to Ruby 2.1 and Capistano 3 compatibility, renamed environment files