Remove commented code as per code review
Add Capistrano3.0 configuraitons