Refs
Fixed conflict
Tidied up some references
Merge branch 'master' of https://github.com/david-deboer/msip-2014