not sure what I changed
Merge branch 'master' of https://github.com/scobb/Impromptu
Merge branch 'master' of https://github.com/scobb/Impromptu
major UI update to stream and working on map