Merge remote-tracking branch 'origin/master' into py3

README.md

@@ -139,6 +139,9 @@ rnascan -p pfm_seq.txt --bg_seq background.txt sequences.fasta > hits.tab
 
 # Citation
 
+Cook, K.B., Vembu, S., Ha, K.C.H., Zheng, H., Laverty, K.U., Hughes, T.R., Ray, D., Morris, Q.D., 2017. RNAcompete-S: Combined RNA sequence/structure preferences for RNA binding proteins derived from a single-step in vitro selection. Methods 126, 18–28.
+http://www.sciencedirect.com/science/article/pii/S1046202317300312
+
 # Links
 
  * [RNAcompete-S supplementary website](http://hugheslab.ccbr.utoronto.ca/supplementary-data/RNAcompete-S/index.html)

setup.py

@@ -59,7 +59,7 @@ def is_Numpy_installed():
       url='http://github.com/morrislab/rnascan',
       author='Kevin Ha, Kate Cook, Kaitlin Laverty',
       author_email='[email protected], [email protected], [email protected]',
-      license='AGPL-3.0',
+      license='AGPLv3',
       packages=find_packages(),
       scripts=['scripts/run_folding'],
       install_requires=['setuptools',