master: s-0wallavoiadnce stuff, cleanup
Merge branch 'master' of github.com:dmanning23/FlockBuddy