Add missing icebox to geonode2-integration branch

Somehow, we branched `geonode2-integration` from an older master where there is no icebox. This is not correct. If you look at the current `geonode2-integration` branch, you should see the icebox, but it's not there.

I tried to clean up the history as best I could and create a clean-ish branch to fix the problem, but there are a lot of other commits here aside from my icebox commits. I don't know why.