add flag to control use of template haskell
add missing cases in unpickle functions
Merge branch 'master' into upstream
Merge branch 'master' of https://github.com/pontarius/pontarius-xmpp into tls-1.2

Conflicts:
	pontarius-xmpp.cabal