Made some changes to ensure consistency and also made some grammatical fixes
Merge branch 'master' of https://github.com/CP317-2013/LorisPlus