- Pulled implementation out of header file in graphics

Conflicts:
	graphics.hpp
- Refactored graphics.cpp to not expose its super
  sekrit sauce xlib dependencies.
- Made city be less headery and therefore less leaky.

Conflicts:
	city.cpp
	city.hpp
Merge remote-tracking branch 'krause/master' into krausepull

Conflicts:
	.gitignore
Fixing a few patch critters