Revert "Pulling from pele-python:master on 09/12/14"
Merge pull request #110 from pele-python/revert-109-master

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