Options: wrote completely new option parser
Options: migrated plugins to new options parser
Options: migrated server core to new option parser
Options: migrated bcfg2-lint to new parser
Options: migrated bcfg2-info to new parser
Options: migrated bcfg2-admin to new parser
Options: migrated bcfg2-test to new parser
Options: converted filemonitors to new options parser
Options: migrated bcfg2-crypt and Encryption libs to new parser
Options: migrated generic database stuff to new parser
Options: migrated reporting to new parser
Options: migrated bcfg2-yum-helper
Options: migrated logging libs to new parser
Options: migrated common utils to new parser
Options: migrated client drivers to new parser
Options: migrated client to new parser
Options: schema changes for changes made for new parser
Options: migrated tools to new parser
Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py