Got rid of complexity in org-mode settings

My previous version was a cut and paste from
http://doc.norang.ca/org-mode.html.  I've now gone through and pruned as
much complexity as I could to get closer to the default settings.

The reason for this is that it gives me a better base for building my
own customizations without being too colored by how norang has done it.