fixes

Conflicts:
	chemX/chemX/settings.pyc
Merge branch 'master' of https://github.com/woodenchopsticks/Pennapps