Fix for broken maps. Removed redundant headers.

Broke the maps while committing some changes last week as part of #newsHACK.

Probably should not have done this...will add some tests next week.
Merge branch 'master' of github.com:iaincollins/fcohack2014