added 'try {}' macro.
Merge remote-tracking branch 'upstream/master'
cap puppet verbosity level at 5 and capistrano logger at 3.
Merge remote-tracking branch 'upstream/master'