Added load flavors from config file + extra specs

Change-Id: I951c6be5ed8604a958b4f4413ceac6415f1520fd
Merge branch 'master' into totalW

Conflicts:
	jumpgate/compute/drivers/sl/servers.py
	tests/jumpgate-tests/compute/test_servers.py
Merge branch 'master' into totalW

Conflicts:
	jumpgate/compute/drivers/sl/servers.py
Resolved the MagicMock issue
Merge branch 'master' into totalW

Conflicts:
	tests/jumpgate-tests/common/test_dispatchers.py
	tests/jumpgate-tests/test.jumpgate.conf
Merge pull request #131 from schivuk/totalW

Added show extra_specs for flavors, code for default flavor to load from...