Added wkhtmltopdf and wkhtmltoimage to default.sls for install onto server
Merge branch 'develop' into wkhtmltopdf
Merge branch 'develop' into wkhtmltopdf
Merge branch 'develop' into wkhtmltopdf
Merge branch 'develop' into wkhtmltopdf

Conflicts:
	conf/salt/project/worker/default.sls
download wkhtmltox package and install it manually
better implementation of architecture switching for wkhtmltox package install
use ``which`` to tell if wkhtmltopdf has been installed and use non-interactive mode for gdebi
Merge pull request #160 from caktus/wkhtmltopdf

Added wkhtmltopdf and wkhtmltoimage to default.sls for install onto serv...