bumping plek to 1.0.0
bumping slimmer to 3.9.5

..which now calls Plek.current.find('static') instead of 'assets'.
Upgrade to rails 3.2.11
Merge branch 'bump-plek'

Conflicts:
	Gemfile.lock
Set appropriate env variables