fix c-like-keys with paredit, install inf-mongo
Merge branch 'master' of github.com:leifwalsh/df
Merge branch 'master' of github.com:leifwalsh/df

Conflicts:
	.emacs.d/init.el