cleanup
getting ready for merge
Merge branch 'master' of https://github.com/jvrunion/pillar