Made memory/time limits all per job type

* Also fixed a silly bug in the --help flag logic

Change-Id: I42418ab0fe6751654f81c90cc8bac3b17e7f72f6