Merge branch 'vulkan_test' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	Makefile
#	llama.cpp

.gitignore

@@ -106,6 +106,7 @@ tests/test-tokenizer-1-bpe
 /koboldcpp_clblast.so
 /koboldcpp_clblast_noavx2.so
 /koboldcpp_cublas.so
+/koboldcpp_vulkan.so
 /koboldcpp_default.dll
 /koboldcpp_failsafe.dll
 /koboldcpp_openblas.dll
@@ -113,6 +114,7 @@ tests/test-tokenizer-1-bpe
 /koboldcpp_clblast.dll
 /koboldcpp_clblast_noavx2.dll
 /koboldcpp_cublas.dll
+/koboldcpp_vulkan.dll
 /cublas64_11.dll
 /cublasLt64_11.dll
 /rocblas/