separate intake and display map functionality
Merge branch 'master' of github.com:jbunting/stories