Merges Wookey changes in the control file (closes #18)
Reformat patches
Merge branch 'master' into archeos-next

Conflicts:
	debian/patches/series
Reformat archeos-next patches