Cleaned up indentation, fixed missing imports/links.

Forced merge from Evilham, caused a lot of issues, then cleaned up a lot
of the issues.
Fixed plugin.yml.
Fixed a bug in listing subdirectories with /maps.
Tried my best to merge the two patches.