consolidated vimrcs
vundler works
added rake task to symlink
merging