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

Sorry, pulled from mine, rather than pele-python.