update version of postgresql
made bootstrap more generic
fix test
Merge branch 'master' of https://github.com/elmundio87/DevopsKeychain-Server

* 'master' of https://github.com/elmundio87/DevopsKeychain-Server:
  update version of postgresql

Conflicts:
	bootstrap.sh