Changes to support 1.2 code (mostly just path names).
Merge pull request #1 from mcowger/1.2support

Changes to support 1.2 code (mostly just path names).