Added /away
Modified stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	funstuff/misc.js

modified stuff