use newer version of vector
don't try to expand type family declarations in ofType_
more CPP fixes
Merge branch 'master' into vector

Conflicts:
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/AmericanFlag.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Combinators.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Common.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Heap.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Insertion.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Intro.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Merge.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Optimal.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Radix.hs
	benchmarks/vector-algorithms-0.5.4.2/Data/Vector/Algorithms/Search.hs
	benchmarks/vector-algorithms-0.5.4.2/LICENSE
	benchmarks/vector-algorithms-0.5.4.2/Setup.lhs
	benchmarks/vector-algorithms-0.5.4.2/bench/Blocks.hs
	benchmarks/vector-algorithms-0.5.4.2/bench/LICENSE
	benchmarks/vector-algorithms-0.5.4.2/bench/Main.hs
	benchmarks/vector-algorithms-0.5.4.2/bench/RadSieve.hs
	benchmarks/vector-algorithms-0.5.4.2/bench/vector-algorithms-bench.cabal
	benchmarks/vector-algorithms-0.5.4.2/include/vector.h
	benchmarks/vector-algorithms-0.5.4.2/tests/Optimal.hs
	benchmarks/vector-algorithms-0.5.4.2/tests/Properties.hs
	benchmarks/vector-algorithms-0.5.4.2/tests/Tests.hs
	benchmarks/vector-algorithms-0.5.4.2/tests/Util.hs
	benchmarks/vector-algorithms-0.5.4.2/vector-algorithms.cabal
Merge branch 'master' into vector
re-add unbox-tuple-instances
Merge branch 'vector'