Gemfile and test gem updates
Merge branch 'master' of github.com:oluf/ppm

Conflicts:
	Gemfile.lock