rubocop fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	recipes/server.rb
rubocop fixes
Merge pull request #35 from jmickle/master

Rubocop fixes