build cleanup
Merge branch 'master' of github.com:wpietri/sunrise
build cleanup