Merge branch 'common-diffpy-patches-py2'

Author: pavoljuhas

.coveragerc

@@ -11,7 +11,7 @@ exclude_lines =
     ^[ ]*assert False
 
     ## Don't complain if non-runnable code isn't run:
-    ^[ ]*@unittest.skip
+    ^[ ]*@unittest.skip\b
     ^[ ]{4}unittest.main()
     if __name__ == .__main__.: