Removed rulers added terminal package
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Packages/User/Preferences.sublime-settings