removed a conflict from the merge
overwrote README.md with https://raw.github.com/qiime/qiime/master/README.md