Remove my silly button stuff
Add basic payment page mock out
Merge branch 'master' of github.com:c00w/BitToll

Conflicts:
	extension/js/background.js