Add ycm_extra_conf.py
Start playing with tags in xmonad
Break off from spf13
Fix and consolidate git mappings
Merge branch 'master' of github.com:johntyree/dotfiles

Conflicts:
	vimrc.local