Merge branch 'master' of github.com:davidhemphill/sublime-text-settings
Add SFTP Settings to gitignore