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
back to default border color
Merge branch 'linux' into mac
Merge linux and change mac changes
Zshified bash prompt
Merge branch 'mac' into linux

Conflicts:
	.bash_aliases
	.bashrc
	.tmux.conf
	bin/fancyprompt
File path mistake