Mailer frame
Update price_watch.html.haml
Pull pg_search and update schema
Merge master into price watch mailer
Merge branch 'mailer'
Merge branch 'master' of github.com:IY-Rails-Store/iron-shop

Conflicts:
	db/schema.rb