Fixing the Gemfile problem with rake update
Fixing up build problems locally.

Not sure if these are things that happened with a slim update or
something else, either way they're fixed now.

Conflicts:
	Gemfile.lock

Updating the Gemfile.lock file to latest
Merge pull request #355 from LightGuard/gemfile_issues

Gemfile & local build issues