changes to junk
Merge branch 'master' of https://github.com/jblacketter/junk