Merged SigmaG's prelease with JCalvinL

Sorry for the mess in this branch. I couldn't find the bookmarks I had
on merging... so I had to improvise since I'm short on time right now. I
basically copied and pasted everything from your pre-release to override
my files so I can test the changes you've made.