improved microformats
Merge branch 'master' of https://github.com/myplanetdigital/swat
improved microformats