Merge pull request #148 from rafecolton/git-bug-and-test-refactor

Git bug and test refactor
Merge remote-tracking branch 'origin/master' into add-enqueue-option