Various updates to snippets (Rspec and Pry) and user config
Merge branch 'master' of github.com:dgmstuart/sublime-text-2-settings

Conflicts:
	ApplySyntax.sublime-settings
	Default (OSX).sublime-keymap