Clear highlight & close popup on layer remove

Closes #5
Merge branch 'master' into gh-pages