Fix for local jobs.
Merge branch 'master' of github.com:jclevesque/spearmint

Conflicts:
	spearmint/spearmint/driver/moab.py
	spearmint/spearmint/main.py
The worst commit in the universe. Dirty code that shall be reviled for years to come by myself.