Added a font setting for my user only which is a start to getting all our configs back to one branch by allowing multi-user configuration in one config.
We don't really want to throw out the baby with the bathwater in the autoload directory, so instead of removing the whole thing I just removed the more complex files that can cause issues with emacs24.  This way we can still organize some of our emacs config logic.  This also re-enables saving backup files to .emacs.d/backup, as well as making multiple buffers with the same name have more intelligable buffer titles.  I also added some notes to the backup and uniquify config so hopefully it's more obvious that they shouldn't be removed in the future.
Updated my user specific config to allow multiple statements so I don't have to look up the syntax next time.