moved things around to fit the 1.7.2 layout, updated to 1.7.2
Merge pull request #1 from Thutmose/master

moved things around to fit the 1.7.2 layout, updated to 1.7.2