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

Reverts khs26/pele#5