Dedup
Merge branch 'master' of github.me:timp/virtualcampfire