Modified .zshrc to work with ubuntu
Added UltiSnips
Merge branch 'master' into ubuntu
Added a bunch of plugins