removed capistrano, using github hook instead
merge