Removed the line if (jj == hh) and added medoid swapped to nonmedoid in
swap code. Also removed unnecessary swap steps introduced in previous
commit.