Configs
Merge branch 'master' of https://github.com/mpiedrav/Configs

Conflicts:
	dot.emacs