Fixing merge conflicts.

The merge didn't quite work. Hopefully this is good.
Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering