Fix aliases for BSD
Update .vimperatorrc (using Mechanical keyboard!)
Revert leader and fix reloadrc
Old leftout macbook changes
Merge branch 'linux' into mac
Merge branch 'linux' into mac

Conflicts:
	.vimperatorrc
Change zsh prompt color
Merge branch 'linux' into mac

Conflicts:
	.oh-my-zsh/custom/stephen.zsh-theme
compton - add fade, et cetra
Change urxvt colorscheme
Save chagnes from Arch
back to default border color
Merge branch 'linux' into mac
Merge linux and change mac changes
Zshified bash prompt
Merge branch mac to master