Merge branch 'dev' of github.com:cismet/cismap-plugin into dev
minor jalopy changes