Merge pull request #1 from alistairstead/master

Merge Origin/Master
Added dependency on Capistrano v2
Generated Gemfile with Magentify
Merge pull request #8 from alexsiri7/force_capistrano_v2

Force capistrano v2