Code style fixes
Merge branch 'master' into rspec

Conflicts:
	Rakefile
	text_adventure.gemspec