june fixes
Merge branch 'master' into nimbustramus-local

Conflicts:
	src/SQUIDS.cpp
SQUIDS updates. July.
Update July/June.
Merge branch 'nimbustramus-local' of https://github.com/arguelles/SQuIDS into nimbustramus-local

Conflicts:
	src/SQUIDS.cpp
Merge branch 'nimbustramus-local'