Fix compatibility with Django 1.6.
Reports: Add missing ImportError

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Options: added workaround for unit tests that use the parser
testsuite: Wrote bcfg2-crypt end-to-end tests
bcfg2-crypt: Fixed several bugs in autodetection of encrypt/decrypt mode
bcfg2-crypt: backported fixes in b5b26415161e715fe4d22d69328b06801ff7124d
bcfg2-crypt: Avoid duplicate decrypt/encrypt when auto-determining mode
Multiprocessing: Added missing Queue back in, merge fail
Options: made unit test flag public
bcfg2-crypt: Fixed variable name collision
Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Admin/Reports.py
	src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py
	src/lib/Bcfg2/Server/Hostbase/urls.py
	src/sbin/bcfg2-crypt
	tools/upgrade/1.3/migrate_dbstats.py
NagiosGen: Sort the hostgroup list

This prevents the hostgroup list from flipping at random.
Merge pull request #145 from stgraber/nagios-fixes

NagiosGen: Sort the hostgroup list
Options: parse config options before setting defaults
Multiprocessing: stringify server core safely before options are parsed
Core: handle errors in FAM thread more verbosely