bumping plek to 1.0.0 and slimmer

...to 3.9.5.
Upgrade to rails 3.2.11
Merge branch 'bump-plek'

Conflicts:
	Gemfile.lock