fixup
ups.
more ycm
revamp path generation
Merge branch 'master' of https://github.com/jmesmon/dotfiles

Conflicts:
	.ycm_extra_conf.pyc