Merge branch 'cobbler-deb'

Murge into master. Pushued to github already
Merge branch 'master' of git://github.com/cobbler/cobbler
Only cosmetic cleanup - removed commands that were commented out, added spaces for more clear code
Merge branch 'cobbler-deb'

Only cosmetic cleanup - removed commands that were commented out, added spaces for more clear code
Merge branch 'master' of git://github.com/cobbler/cobbler

merge with upstream master
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' of git://github.com/cobbler/cobbler

pull master from github
Merge pull request #363 from jimi1283/master

BUGFIX - edit not respecting hash item deletion syntax ('~')
Fixed up a bad merge in koan/virtinstall.py

Conflicts:
	koan/virtinstall.py
Merge branch 'master' of git://github.com/cobbler/cobbler
Adding ubuntu checks for kickstart_done snippet
Added signature for ESXi 5.1 and a generic26 entry
BUGFIX - fix for "NoneType' object has no attribute 'lower" error on distro rename
Changed default behaviors when editing interfaces and updated help text

- Help text updated to suggest using --interface with network flags.
- Added checks to the __get_interface() method in item_system.py
  - If a single interface is defined default to using that one.
  - If multiple interfaces are defined raise an exception and quit.
  - If neither of the above exist then create an eth0 interface with defaults.
Merge branch 'master' into interfaces-update
Added check for whether or not to populate extra variables exist for other distro types in kickstart generation
Partial revert of 2ba13cde51d315d to reinstert a copyright notice removed improperly
Added Uwe Gansert to the AUTHORS file
Merge pull request #371 from dgivens/master

meta["tree"] assumed in kickgen.generate_kickstart()
Merge pull request #370 from ahamilton55/interfaces-update

Interfaces update