Rewrote code for marker popups to use Underscore template
Rewrote code for marker popup when locating place to use Underscore template
Using correct icon on place edit

Container type was added to place to support placement of different container types to different locations with same name. Fixes #28.