Revert "Tidied allmain.c"

This reverts commit 5700370ba125b1069cf82cd0565197e88935fb38.
Updated TODO
Merge branch 'master' into develop
Merge branch 'develop' into tidying

Conflicts:
	src/allmain.c