Updated scripts
Cleanup
Changes that needed to be added back
This file is needed
Updated namecleaner
Merge branch 'dev'

Conflicts:
	bin/monitor.php

another