Cleans up bad merge

Eclipse GUI for git was acting up, so I tried
to commit through command line and caused
a sloppy merge. Forgot to delete the extra 
garbage text which is deleted here.