added an install script for emacs 24. Renamed the create script to setup since it now does more than just create links
fixed a merge conflict