Reorganized vimrc; ackrc ignores rails source dir; added alias for icdiff to bashrc