Place player in map

Updated code so that controller gets actual Map object, and player is
placed in it. Meant I had to move around the order of initialization in
Driver, but didn't actually change what code got called there.
Merge branch 'master' of https://github.com/apepers/599-roguelike