preparing 0.9.6 release
Merge branch 'maint/0.9' of github.com:flapjack/flapjack into maint/0.9
prepare 0.9.6 release