Misc.
Merge branch 'master' of github.com:rahulkmr/dotfiles

Conflicts:
	.vim/bundle/paredit.vim