Freeze and update requirements
Move 'include' urls to the top of the conf
Merge pull request #227 from steventlamb/topic/reorganize

Topic/reorganize
Add new map icons. Update map and legend.

Use static map maker icons instead of dynamic icons. Update map and
legend to use new static icons.
Merge pull request #228 from cwimbrow/topic/update_map_markers

Add new map icons. Update map and legend.