updated
fixing gaaah
Removing oh-my-zsh this is handled by boxen
Merge branch 'master' into mac-laptop