Merge pull request #1 from verneroberts/master

Merging in Verne's changes to push to live
Merge pull request #2 from verneroberts/master

a few quick tweaks to make it "playable"
Fixed vernes hasty error
Merge pull request #3 from Technicolour/development

Fixed vernes hasty error
Fixed vernes tests....
Merge pull request #4 from Technicolour/development

Fixed vernes tests....
Merge pull request #1 from Technicolour/master

luke fixing my horrible code