Upgrading for SS3.1 compatibility.
Fixed the problem with an import not writing correctly.
Some minor 3.1 template fixes.
Merge pull request #2 from NGlasl/3.1

Upgrade to 3.1.