Nextpass

All commented changes from merged 'edits' branch are applied in this branch, save for one. Line 95 left to @jlacefie discretion, note made in closed PR.

Someone else please merge and close this PR haha, I'm fired tonight. 
![just-one-job](https://cloud.githubusercontent.com/assets/5125279/4930786/80866d30-656a-11e4-864b-6dd16655546d.gif)