Update some functs and aliases
youtube.js added from https://gist.github.com/maksimr
few fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.aliases