grim/guifications2

grim/guifications2/
merging the condense work back in

2010-11-28, Gary Kramlich
5646b85f1e1c