don't hard-wrap latex
annotations mode changes
added sublime files back
Don't reset number of lines in gnome vim (breaks yakuake terminal)
cleanup
better git mergetool handling and better vim outline mode
Merge branch 'master' of github.com:rdeits/config

Conflicts:
	zshrc
Moved custom color scheme into User/ folder; added goSublime package
Don't install git package
Remove files that shouldn't be tracked
Load URDF as XML
Use alt+ctrl+c to open console on linux
trim whitespace
ignore git package
ignore git package
py debug snippet
detect .m files as matlab
add git gutter plugin
Diff coloring
vim-like commands for pane switching