Merge branch 'decianm-TurboSPTeslaMCConfiguration' into '2017-patches'

Trying to get TurboSP and MC with truthmatching to work

See merge request !101

(cherry picked from commit bf52f8bf)

87e70041 First commit of Configuration file, trying to get TurboSP MC to run with truthmatching
8e646c9a fix some typos
6fc9415d Commit latest try for neutral association in TurboSP
d6b201cf Add working neutral-matching logic, tidy up.
67d09999 Working version.
c4797d9e Remove temporary comments.