Merge pull request #28 from rjleveque/rjl

Fixed conflict statements in swirl/setrun.py