various
Merge branch 'master' of github.com:jasonknight/unstoopid-include

Conflicts:
	unstoopid-include.php