Fix more compiler errors/warnings and remove dead code from FreeImage branch.
Missed picking up a compiler fix (type punned pointers again) from boost 1.52.0
At some point FreeImage will build clean; fix for Visual C++ complaining about an unreachable catch block.