Add Silk packages
Skip some tests
Reenable rest tests silkapp/rest#40
Add hybrid-vectors
snapframework -> mightybyte
Add openpgp-asciiarmor
Merge pull request #250 from clinty/master

Add openpgp-asciiarmor
Disable json-schema tests for GHC 7.6 silkapp/json-schema#8
add hledger
Merge pull request #252 from simonmichael/master

add hledger
Remove pretty-show constraints #253
Add imagesize-conduit
Revert "convert diagrams mentions to diagrams/Core team"

It appears this does not actually work; see
https://github.com/fpco/stackage/pull/244#issuecomment-48469406 .

This reverts commit bf61e01909d788146909602b07cf8e30e32cf69e.
Merge pull request #254 from mbrock/add-imagesize-conduit

Add imagesize-conduit
Merge pull request #255 from byorgey/master

Revert "convert diagrams mentions to diagrams/Core team"
Allow multiple github user mentions
Merge branch 'multi-github-mentions' of https://github.com/bergmark/stackage
Merge branch 'master' of github.com:fpco/stackage

Conflicts:
	Stackage/Config.hs
Upper bound for #257
Update convertGithubUser comment