Merge pull request #1 from NathanKell/master

Fixes to minimize excess files, make paths work, etc
Merge pull request #2 from NathanKell/master

Convert city light/dark to DDS