update changes
Merge remote-tracking branch 'sqream/master'
rework the build system

remove all package-o-tron stuff
build everything with cabal always from the Makefile
use a shared cabal sandbox for everything
add sandbox target in makefile to set up the sandbox and install
  correct uuagc, etc.
add cabal files for the examples, postprocess-uuagc
work on build

get regen catalog working
update the catalog to pg 9.3.4
update the cabal files to >= 1.10 and haskell2010 style
use external here package
roll back defaulttemplate1catalog since pg 9.3 has some new stuff which isn't supported yet
get build working with 7.6.3 also
add some -j to makefile
fix the build

switch away from here package since there is a compilation issue with
  it
rearrange the cabal sandbox installs slightly
start resurrecting the website builder
tweak the website gen a bit
work on build
refactor the test infrastructure to expose the test data better
fix some warnings
progress towards the getting the generated test html pages working again
add tests back to website
fix the tests for the website
Merge remote-tracking branch 'sqream/master'

Conflicts:
	autorules.mk
	hssqlppp-th/hssqlppp-th.cabal
	hssqlppp/src/Database/HsSqlPpp/Pretty.lhs
Merge remote-tracking branch 'origin/master'

Conflicts:
	hssqlppp/src/Database/HsSqlPpp/Internals/TypeChecking/Environment.lhs
	hssqlppp/src/Database/HsSqlPpp/Pretty.lhs
Merge remote-tracking branch 'sqream/master'

Conflicts:
	Makefile
	hssqlppp-th/hssqlppp-th.cabal
fix version numbers