Fixes autointenting C in vim
Merge branch 'master' of github.com:neunenak/dotfiles
Addding .psqlrc

cf.
http://robots.thoughtbot.com/improving-the-command-line-postgres-experience/
Merge branch 'master' of github.com:neunenak/dotfiles

Conflicts:
	vimrc