update scratchpad
update for Capistrano 3.1
add git tips and tricks section