Merge branch 'master', remote-tracking branch 'origin' into persist
Merge branch 'master', remote-tracking branch 'origin'
local fix to compile blir on mac os x
emacs local variables corrections
persist_example correction
added chunked_dot.py sample, first draft
added first draft for blz datashape tests.
merged from origin
cleaned up a bit the Makefile. It should properly support linux and mac os x now
Merge branch 'master' into persist
Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
	blaze/blir/codegen.py
	blaze/blir/exc.py
	blaze/blir/opcodes.py
	blaze/blir/passes.py
	blaze/blir/prelude.c
	blaze/cgen/kernels.py
	blaze/datashape/coretypes.py
	blaze/datashape/parser.py
	docs/source/compiler.rst
	samples/persist_example.py
	setup.py
Merge branch 'master' into persist
adapted chunked_dot so that it works
more tweaks to chunked_dot.py
Temporariliy disable optimizer.
knownfailures handled "by hand" in test_blz_datashape.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/persist' into persist
Merge branch 'master' into persist
support for scalars as terminals