Fix osx defaults
Change ruby slim sublime plugin
Merge branch 'master' of git://github.com/dpree/dotfiles
Add rubocop sublime plugin
Add markdown syntax highlighting to sublime
Merge branch 'master' of git://github.com/dpree/dotfiles

Conflicts:
	install_scripts/sublime_text2.sh