more cleanup

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
Merge branch 'master' of https://github.com/Approach/Approach

Signed-off-by: Garet Claborn <garet@approachfoundation.org>