personal configuration
should be linking local config files as well for vim
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vimrc
mistake in merging
updating changes made at reflektion
fixing ctrl p's working directory
removed gitgutter keyboard shortcut in favour of jedi's goto local
definition
java should be 4 tabs
make gitgutter colors better
java expandtab
add every fucking config file I have, plus change to zsh
adding local profile (should be different for every machine)
removing zsh-syntax-highlighting
adding zsh syntax highlighting
updating profile local and zsh
fixing profile, had work aliases
fixing profile local for chunli-air
deleting profile.local
uploading rainbows
oops forgot variable