Improvements

Template expansion, widespread unit addition, bugfix
Merge pull request #20 from PecanProject/bettermaps

misc. improvements and bug fixes for maps