Bumper formatting update!

This:
* Puts common.h into include and C++ files
  (so Syntastic etc. work properly)
* Gets rid of the monster tree.h etc. includes from files that don't
  need them
* Has some style changes.