Initial Commit
Merge branch 'master' of github.com:rodaine/Sublime-Text-2-Settings

Conflicts:
	.gitignore
Ok here we go again