Push versions to 2.0, shift .popup widget to use bootstrap, minor fix to gmap locator load order