Fixing stpresence
Merge pull request #18 from bmmiller/st-presence-fix

Fixing stpresence
Merge branch 'master' into new-style
Removing redundant changes from master merge.