added Package Control.sublime-settings to .gitignore
Merging divergant branches.