pele-python/pele — pull request #45 by smcantab (2014-07-03 14:48:20+00:00)
Title: residual new fire merge (DO NOT MERGE)

after the last pr i found that there are residual differences after a merge with pele master, not sure whether these are redundant or not