Updates required for going to capistrano 3.2
Whitespace changes only