back out our stuff to prep for happy foo
patch up to civicrm 4.4.5
add our stuff back in in prep for civicrm upgrade branch help