reformat file patterns
Merge branch 'master' of github.com:rdeits/config

Conflicts:
	sublime-config/Preferences.sublime-settings
lcm as C syntax
Add ssh indication to zsh prompt