gitflow tweaks
whitspace-cleanup with emacs batch
Merge branch 'master' of github.com:massemanet/cookbook