Merge lp:~smartboyhw/testdrive/lp-1154563 into lp:testdrive

[Howard Chan]

This addes a Kubuntu Active Desktop image to Testdrive and fixes LP: #1154563

=== modified file 'testdrive/testdrive.py'
--- testdrive/testdrive.py	2012-04-21 02:05:42 +0000
+++ testdrive/testdrive.py	2013-04-15 16:05:56 +0000
@@ -112,6 +112,8 @@
                     category = 'kubuntu'
                 elif category == 'kubuntu-mobile':
                     category = 'kubuntu'
+                elif category == 'kubuntu-active':
+                    category = 'kubuntu'
                 flavor = iso.split()[0].capitalize()
                 if flavor == 'Ubuntu-netbook':
                     flavor = 'Ubuntu'
@@ -121,6 +123,8 @@
                     flavor = 'Kubuntu'
                 elif flavor == 'Kubuntu-mobile':
                     flavor = 'Kubuntu'
+                elif flavor == 'Kubuntu-active':
+                    flavor = 'Kubuntu Active'
                 elif flavor == 'Ubuntustudio':
                     flavor = 'Ubuntu Studio'
                 elif flavor == 'Ubuntu-server':