Added separator placeholders and popup options to adblock

* Prefixed and appended each domain with the ^ placeholder for any separator
  character (.:/?# or the end of the address)
* Added the $popup option to domains that were added because of their popups