added options and packages
Merge remote branch 'origin/master'

Conflicts:
	agent/yum.rb