Prep for version 1.3.3.
Switch to mysql2 gem for better Ruby encoding compatiblity.
Upgrade rdiscount to 2.1 series.
Add note about incompatibility with Debian/Ubuntu wkhtmltopdf.
Prep for version 1.3.4.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile
	Gemfile.lock
	lib/one_click_orgs/version.rb