Bump trapperkeeper to kitchensink 0.4.2
Merge pull request #107 from cprice404/maint/0.1.x/kitchensink-0.4.2

Bump trapperkeeper to kitchensink 0.4.2
Bump version number to 0.1.1 for release
Bump version to 0.1.2-SNAPSHOT for dev
Merge branch '0.1.x' into 0.2.x

Conflicts:
	project.clj
Merge branch '0.2.x'

Conflicts:
	project.clj
	src/puppetlabs/trapperkeeper/services/jetty/jetty_config.clj