Cleaned up library imports a bit -- could do more

 Changes to be committed:
	modified:   fullmsa.py -- would like to remove scipy dep in future
	modified:   pinfwrapper.py
	modified:   water.py

 Untracked files:
	app/.queueing.py.swp