Moar!
Fixes and more
Merge https://github.com/mortie/mortSubs

Conflicts:
	global.js
Merge https://github.com/mortie/mortSubs

Conflicts:
	global.js
Merge pull request #3 from Ckef/master

All the fixes