build system updates
Merge branch 'master' of github.com:ekmett/linear

Conflicts:
	linear.cabal