Squashed commit of the following:

commit 690a32fc91478a09fed94985ac7eef18e6cf9341
Author: MilhouseVH <milhouseVH.github@nmacleod.com>
Date:   Tue May 28 11:21:32 2013 +0100

    Fix: QA field processing

commit 1eede27873c3becc7a134432b28c4d76c74e87b8
Author: MilhouseVH <milhouseVH.github@nmacleod.com>
Date:   Tue May 28 11:09:59 2013 +0100

    Fix: extrajson properties - again
Fix git