add vim bkp files to gitignore
add postgresql
Merge branch 'master' of github.com:alinefr/flask-blog

Conflicts:
	.gitignore
	salt/postgresql/init.sls