upgraded ruby to 2.1.1 and rails to 4.1.1
Merge branch 'master' of github.com:homesteading/homesteading-bookmark

Conflicts:
	Gemfile.lock
bundled