Merged fork with latest original master

dca54ec7 · Saurabh Belsare · cace5edf · 01f9e415 · dca54ec7 · dca54ec7
Commit dca54ec7 authored Jun 30, 2016 by Saurabh Belsare
4 changed files
--- a/wrappers/python/tests/systems/par_all36_cgenff.prm
+++ b/wrappers/python/tests/systems/par_all36_cgenff.prm
--- a/wrappers/python/tests/systems/test_amber_ff.xml
+++ b/wrappers/python/tests/systems/test_amber_ff.xml
--- a/wrappers/python/tests/systems/tip5p.pdb
+++ b/wrappers/python/tests/systems/tip5p.pdb
+CRYST1   30.000   30.000   30.000  90.00  90.00  90.00 P 1           1 
+ATOM      1  O   HOH A   1      20.612  20.351  16.218  1.00  0.00          O
+ATOM      2  H1  HOH A   1      20.565  20.405  15.264  1.00  0.00          H
+ATOM      3  H2  HOH A   1      21.273  19.679  16.387  1.00  0.00          H
+ATOM      4  D1  HOH A   1      20.808  20.964  16.492  1.00  0.00          EP
+ATOM      5  D2  HOH A   1      19.994  20.162  16.486  1.00  0.00          EP 
+TER       6      HOH A   1
+END 
--- a/wrappers/python/tests/systems/top_all36_cgenff.rtf
+++ b/wrappers/python/tests/systems/top_all36_cgenff.rtf