[kepler-dev] the big merge

[Chad Berkley]

Hi,

I just did the merge from the 1.0.0 branch back to the head.  I did not 
remove any of the files from the head that we had removed from the 
branch.  I did merge any "positive" changes from the branch back to the 
head.  if you see anything that didn't get merged or isn't working, 
please let me know.

thanks,
chad