First pass at making GIMP references more meaningful. This commit also contains gratuitious whitespace changes.