Fixes so that blaze imports with the new datashape
Fixes for using the new datashape grammar
Fix some errors
Worked most of the errors out of the tests
Remove use of unify in the catalog
Merge remote-tracking branch 'upstream/master' into new_parser

Conflicts:
	blaze/compute/expr/context.py
Remove the compute.expr.context file
Fixes to the hdf5 catalog + tests
Skip the failing SQL test for now, needs some work on the sql data descriptor
Merge pull request #165 from mwiebe/new_parser

Updates for new datashape grammar
Clean up setup.py a bit