Dev2 is ready for merging into your develop branch.

Hi Curtis,
I completed your merge request into dev and then into dev2. So now dev2 is the most complete branch.
I fixed a few conflicts in the process, so please accept this pull request before doing any additional work.
Github should be able to merge this automatically.
Once done, eight months of divergent code should now be back in sync. :)
Cheers!