added some settings for my linux vm
some osric fixes
reboot on emacs config, brought into dotfile repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	zsh/zshrc.zsh
added the clang headers to the repo... hack, but easy