Merge branch 'master' into dev
Merge branch 'dev' of github.com:tylerbrazier/dotfiles into dev

Conflicts:
	mklinks.sh
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge remote-tracking branch 'origin/dev' into dev
Better blue in Xres and no enter to esc in vimrc
vimrc mouse in normal mode; small mklinks change