sublime text settings and snippets
Merge branch 'master' into develop

* master:
  init commit
  init commit
  update
  update for 2015
  delete unused config files
  delete sublime files
  delete vim files

Conflicts:
	User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	User/Package Control.last-run
	User/Package Control.sublime-settings
	User/Preferences.sublime-settings
init commit
remove cache files
add sublime text prefs