Lots of formatting changes and funsies
Merge remote-tracking branch 'origin/Update' into Update

Conflicts:
	site/sms-hello-monkey.php