resolve conflict from previous merge in plasma.py
resoved all conflicts in plasma.py
Merge branch 'master' of https://github.com/calypsoh13/miscScripts
Also, edited docstrings.
Conflicts:
	plasma.py
Merge pull request #3 from cogitokat/master

Docstring changes