use deploy user
update gitignore
Merge branch 'dev' of github.com:briansw/ci into dev