Commit fixes for compiling on ubuntu 12.04
More compilation fixes and dead code removal
Further cleanups to my previous patches to make code consistent.
Merge branch 'master' of https://github.com/bms20/gaffer into bms20-master
Fixed minor tabs vs spaces issue.