fixes to smartmin for 1.6
Merge branch 'master' of github.com:nyaruka/smartmin