Merge branch 'master' of github.com:drewblessing/paste