First commit of the disparity draft after NC's comments from 05/05/14
Merge branch 'master' of https://github.com/SiveFinlay/Disparity