Partial commit… I need to make a pull!
Merge branch 'master' of https://github.com/sajirdalas/kuadrant-backbone
Mapcontainer semi-fix :-(