Revert "Pulling from pele-python:master on 09/12/14"
Merge pull request #7 from khs26/revert-5-master

Revert "Pulling from pele-python:master on 09/12/14"