shouldn't bundle update on install
Merge branch 'dev'
remove git-deploy
initial travis configuration
add database settings for TCI
Merge branch 'master' into dev