Fixes naming convention

Squashed commit of the following:

commit 6f98f1c63bef0e22449848ad17208145bc1e636e
Merge: 244083f 92dfdbd
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Jan 3 02:31:37 2014 -0800

    Merge pull request #2 from adaptlearning/issue/1

    Issue/1

commit 92dfdbd52576101838880892b83ffaf8ee185e2f
Author: Kev Adsett <kev.adsett@gmail.com>
Date:   Thu Jan 2 13:04:42 2014 +0000

    Capitalise mcq variable name