prepare 1.2.1 release
Merge branch 'maint/1.x' of github.com:flapjack/flapjack into maint/1.x
add in details about sneaky commit