Merge pull request #2 from liamwaugh/branch_LW_20140316

Branch lw 20140316
Merge pull request #4 from TeamProject1014/master

Massive clean up
Merge pull request #12 from liamwaugh/master

Massive clean up