Merge pull request #6 from esheffield/master

Clean up some inconsistencies in the get_next_job code