added first experimental presence
reverted my changes
resolved conflict
Merge branch 'master' of https://github.com/blakeeb/ghost-fire