switching order seen to be problematic in rospkg
fixing yaml diffing for python3
Merge pull request #33 from ros-infrastructure/python3_fixup

Python3 compatibility fixups