Merge branch 'master' of https://github.gatech.edu/casl/Vortex

Conflicts:
	benchmarks/opencl/bfs/Makefile
	benchmarks/opencl/convolution/Makefile
	benchmarks/opencl/guassian/Makefile
	benchmarks/opencl/kmeans/Makefile
	benchmarks/opencl/nearn/Makefile
	benchmarks/opencl/saxpy/Makefile
	benchmarks/opencl/sfilter/Makefile
	benchmarks/opencl/sgemm/Makefile
	benchmarks/opencl/transpose/Makefile
	benchmarks/opencl/vecadd/Makefile
	driver/tests/basic/Makefile
	driver/tests/demo/Makefile
	driver/tests/dogfood/Makefile
	miscs/rvvector/vector_test/Makefile
	runtime/Makefile
	runtime/tests/dev/Makefile
	runtime/tests/hello/Makefile
	runtime/tests/nlTest/Makefile
	runtime/tests/simple/Makefile
	runtime/tests/vecadd/Makefile

driver/opae/vlsim/.gitignore

@@ -0,0 +1 @@
+/obj_dir/*