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

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

Rubocop fixes
Merge branch 'master' of https://github.com/Webtrends/rundeck

Conflicts:
	attributes/default.rb
	metadata.rb
	recipes/chef-rundeck.rb
	recipes/default.rb
	recipes/node_unix.rb
	recipes/node_windows.rb
	recipes/server.rb
Merge branch 'master' of https://github.com/Webtrends/rundeck