Changes for #153

Changed 'enabled' checkbox to read from correct value.
Tidied some controller logic.
Some other small tidy-ups.
Fix for #158.

Using the OpenLayers is130 method which matches both WMS-1.3.0 and GEO-1.3.0 but now NCWMS-1.3.0
Broken Jasmine test for #158 fix