adds marrionette and moves map code to map.js