added capistrano to deploy to loki
Merge remote-tracking branch 'origin/master' into sign-in-out

local changes diverged