new plugins, changed alias
Merge remote-tracking branch 'upstream/master'
changed syd restart to sc-restart
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.aliases