updates from client feedback
Merge branch 'master' of https://github.com/diccfish/yogisadie