Updated qiime website pointed from qiime.sourceforge.net to www.qiime…

….org.

INSTALL

@@ -1,4 +1,4 @@
 QIIME install
 ============
 
-Install notes are provided at `http://qiime.sourceforge.net <http://qiime.sourceforge.net>`_.
+Install notes are provided at `http://www.qiime.org <http://www.qiime.org>`_.

README

@@ -1,7 +1,7 @@
 QIIME Readme
 ============
 
-The definitive source for information on QIIME is the QIIME website at `http://qiime.sourceforge.net <http://qiime.sourceforge.net>`_. The information contained in this document is very minimal in comparison.
+The definitive source for information on QIIME is the QIIME website at `http://www.qiime.org <http://www.qiime.org>`_. The information contained in this document is very minimal in comparison.
 
 :Download: via sourceforge at `http://sourceforge.net/projects/qiime <http://sourceforge.net/projects/qiime>`_.
 
@@ -27,7 +27,7 @@ Documentation
 Installation instructions, a tutorial, and documentation
 --------------------------------------------------------
 
-Installation notes, a tutorial, and documentation is provided at `http://qiime.sourceforge.net <http://qiime.sourceforge.net>`_.
+Installation notes, a tutorial, and documentation is provided at `http://www.qiime.org <http://www.qiime.org>`_.
 
 Testing
 -------

doc/vb_files/Before_you_start/3.Getting_started_with_QIIME.txt

@@ -15,4 +15,4 @@ Note that the command wget works as follows: "wget URL_to_file". The entire comm
 This will download the two required files to your home directory. These files are used by QIIME and their location is set in the /home/qiime/.qiime_config file, if you move them from your home directory, please, update this file with the new location.
 
 Once you have downloaded these files, you should be ready to run your first QIIME analysis. The best way to start is reading the tutorial, available locally by double clicking on the documentation.html in the Before_you_start folder. If you are using the current Virtual Machine version you can also use the online documetation, here:
-   http://qiime.sourceforge.net/
+   http://www.qiime.org/

setup.py

@@ -19,11 +19,11 @@
 
 
 long_description = """QIIME: Quantitative Insights Into Microbial Ecology
-http://qiime.sourceforge.net
+http://www.qiime.org
 
 QIIME Allows Integration and Analysis of High-Throughput Community Sequencing Data
 J. Gregory Caporaso, Justin Kuczynski, Jesse Stombaugh, Kyle Bittinger, Frederic D. Bushman, Elizabeth K. Costello, Noah Fierer, Antonio Gonzalez Pena, Julia K. Goodrich, Jeffrey I. Gordon, Gavin A. Huttley, Scott T. Kelley, Dan Knights, Jeremy E. Koenig, Ruth E. Ley, Cathy A. Lozupone, Daniel McDonald, Brian D. Muegge, Meg Pirrung, Jens Reeder, Joel R. Sevinsky, Peter J. Turnbaugh, William van Treuren, William A. Walters, Jeremy Widmann, Tanya Yatsunenko, Jesse Zaneveld and Rob Knight. 
-Manuscript under review. 2010.
+Nature Methods, 2010.
 """
 
 doc_imports_failed = False
@@ -58,8 +58,8 @@ def build_html():
 pycogent_version = tuple([int(v) \
         for v in re.split("[^\d]", cogent.__version__) if v.isdigit()])
 
-if pycogent_version < (1,4):
-    print "PyCogent >= 1.4.0 required, but %s is installed." % cogent.__version__
+if pycogent_version < (1,5):
+    print "PyCogent >= 1.5.0 required, but %s is installed." % cogent.__version__
     exit(1)
 
 setup(name='QIIME',
@@ -69,7 +69,7 @@ def build_html():
       author_email=__email__,
       maintainer=__maintainer__,
       maintainer_email=__email__,
-      url='http://qiime.sourceforge.net',
+      url='http://www.qiime.org',
       packages=['qiime','qiime/parallel','qiime/pycogent_backports'],
       scripts=glob('scripts/*py'),
       package_data={'qiime':\
@@ -79,7 +79,6 @@ def build_html():
                     'support_files/images/*png',\
                     'support_files/jar/*jar',\
                     'support_files/js/*js',\
-                    'support_files/sra_xml_templates/*xml',\
                     'support_files/R/*r']},
       long_description=long_description,
 )