Merged build from master

MANIFEST.in

-include README.md
-recursive-include scoria sample files *
\ No newline at end of file

scoria/README.md → README.md

@@ -10,7 +10,7 @@ The Latest Version
 ------------------
 
 The latest version of scoria can be found on the Durrant gitlab under
-https://git.durrantlab.com/jdurrant/pymolecule2
+https://git.durrantlab.com/jdurrant/scoria
 
 Documentation
 -------------

conda_setup.sh

-#!/bin/bash
-
-conda config --add channels MDAnalysis
-conda create --name scoria numpy scipy mdanalysis
-
-source activate scoria
\ No newline at end of file