Cleaning out a lot of trash before merging.
Added back gitignore stuff and the .emacs/packages directory