diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..ace8bbd
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,12 @@
+
+let s:vimrc=expand('<sfile>')
+let s:host=hostname()
+
+if filereadable(s:vimrc.'.'.s:host)
+	execute 'source '.s:vimrc.'.'.s:host
+elseif filereadable(s:vimrc.'.win64') && has('win64')
+	source s:vimrc.'.win64'
+elseif filereadable(s:vimrc.'.linux') && has('unix') 
+	source s:vimrc.'.linux'
+endif
+
diff --git a/.vimrc.amy-vkhachat-w7 b/.vimrc.amy-vkhachat-w7
new file mode 100644
index 0000000..2b512d8
--- /dev/null
+++ b/.vimrc.amy-vkhachat-w7
@@ -0,0 +1,27 @@
+"
+"	the root of all 3pty libraries
+"
+let g:srcdir=$HOME . "\\src"
+"
+"	BOOST
+"
+let g:boostdir=g:srcdir."\\boost_1_56_0"
+let g:boostinc=g:boostdir
+let g:boostlib=g:boostdir."\\stage\\win64_vc12\\lib"
+let g:boostbin=g:boostlib
+let g:Bboost=g:boostbin.";"
+let g:Iboost=" /I\"".g:boostinc."\""
+let g:Lboost=" /LIBPATH:\"".g:boostlib."\""
+"
+"	Intel TBB
+"
+let g:tbbdir=g:srcdir."\\tbb43_20140724oss"
+let g:tbbinc=g:tbbdir."\\include"
+let g:tbblib=g:tbbdir."\\lib\\intel64\\vc12"
+let g:tbbbin=g:tbbdir."\\bin\\intel64\\vc12"
+let g:Btbb=g:tbbbin.";"
+let g:Itbb=" /I\"".g:tbbinc."\""
+let g:Ltbb=" /LIBPATH:\"".g:tbblib."\" tbb.lib"
+let g:tbbmalloc=" tbbmalloc.lib"
+let g:tbbmproxy=" tbbmalloc_proxy.lib"
+
diff --git a/.vimrc.linux b/.vimrc.linux
new file mode 100644
index 0000000..1673880
--- /dev/null
+++ b/.vimrc.linux
@@ -0,0 +1,26 @@
+"
+"	the root of all 3pty libraries
+"
+let g:srcdir=$HOME . "/src"
+"
+"	BOOST
+"
+let g:boostdir=g:srcdir."/boost_1_53_0"
+let g:boostinc=g:boostdir
+let g:boostlib=g:boostdir."/lib-amd64/lib"
+let g:boostbin=g:boostlib
+let g:Bboost=g:boostbin.":"
+let g:Iboost=" -I".g:boostinc
+let g:Lboost=" -L".g:boostlib
+"
+"	Intel TBB
+"
+let g:tbbdir=g:srcdir."/tbb41_20130116oss"
+let g:tbbinc=g:tbbdir."/include"
+let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
+let g:tbbbin=g:tbblib
+let g:Btbb=g:tbbbin.":"
+let g:Itbb=" -I".g:tbbinc
+let g:Ltbb=" -L".g:tbblib." -ltbb"
+let g:tbbmalloc=" -ltbbmalloc"
+let g:tbbmproxy=" -ltbbmalloc_proxy"
diff --git a/.vimrc.pi.vostan.org b/.vimrc.pi.vostan.org
new file mode 100644
index 0000000..1673880
--- /dev/null
+++ b/.vimrc.pi.vostan.org
@@ -0,0 +1,26 @@
+"
+"	the root of all 3pty libraries
+"
+let g:srcdir=$HOME . "/src"
+"
+"	BOOST
+"
+let g:boostdir=g:srcdir."/boost_1_53_0"
+let g:boostinc=g:boostdir
+let g:boostlib=g:boostdir."/lib-amd64/lib"
+let g:boostbin=g:boostlib
+let g:Bboost=g:boostbin.":"
+let g:Iboost=" -I".g:boostinc
+let g:Lboost=" -L".g:boostlib
+"
+"	Intel TBB
+"
+let g:tbbdir=g:srcdir."/tbb41_20130116oss"
+let g:tbbinc=g:tbbdir."/include"
+let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
+let g:tbbbin=g:tbblib
+let g:Btbb=g:tbbbin.":"
+let g:Itbb=" -I".g:tbbinc
+let g:Ltbb=" -L".g:tbblib." -ltbb"
+let g:tbbmalloc=" -ltbbmalloc"
+let g:tbbmproxy=" -ltbbmalloc_proxy"
diff --git a/cf5-opt.vim b/cf5-opt.vim
deleted file mode 100644
index 0e2dbd1..0000000
--- a/cf5-opt.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-function! s:SetUpLibrariesLinux()
-	"
-	"	the root of all 3pty libraries
-	"
-	let g:srcdir=$HOME . "/src"
-	"
-	"	BOOST
-	"
-	let g:boostdir=g:srcdir."/boost_1_53_0"
-	let g:boostinc=g:boostdir
-	let g:boostlib=g:boostdir."/lib-amd64/lib"
-	let g:boostbin=g:boostlib
-	let g:Bboost=g:boostbin.":"
-	let g:Iboost=" -I".g:boostinc
-	let g:Lboost=" -L".g:boostlib
-	"
-	"	Intel TBB
-	"
-	let g:tbbdir=g:srcdir."/tbb41_20130116oss"
-	let g:tbbinc=g:tbbdir."/include"
-	let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-	let g:tbbbin=g:tbblib
-	let g:Btbb=g:tbbbin.":"
-	let g:Itbb=" -I".g:tbbinc
-	let g:Ltbb=" -L".g:tbblib." -ltbb"
-	let g:tbbmalloc=" -ltbbmalloc"
-	let g:tbbmproxy=" -ltbbmalloc_proxy"
-
-endfunction
-
-function! s:SetUpLibrariesWindows()
-	"
-	"	the root of all 3pty libraries
-	"
-	let g:srcdir=$HOME . "\\src"
-	"
-	"	BOOST
-	"
-	let g:boostdir=g:srcdir."\\boost_1_53_0"
-	let g:boostinc=g:boostdir
-	let g:boostlib=g:boostdir."\\stage\\win64_vc12\\lib"
-	let g:boostbin=g:boostlib
-	let g:Bboost=g:boostbin.";"
-	let g:Iboost=" /I\"".g:boostinc."\""
-	let g:Lboost=" /LIBPATH:\"".g:boostlib."\""
-	"
-	"	Intel TBB
-	"
-	let g:tbbdir=g:srcdir."\\tbb41_20121003oss"
-	let g:tbbinc=g:tbbdir."\\include"
-	let g:tbblib=g:tbbdir."\\lib\\intel64\\vc11"
-	let g:tbbbin=g:tbbdir."\\bin\\intel64\\vc11"
-	let g:Btbb=g:tbbbin.";"
-	let g:Itbb=" /I\"".g:tbbinc."\""
-	let g:Ltbb=" /LIBPATH:\"".g:tbblib."\" tbb.lib"
-	let g:tbbmalloc=" tbbmalloc.lib"
-	let g:tbbmproxy=" tbbmalloc_proxy.lib"
-	"
-	"	Win SDK
-	"
-	let g:wsdkdir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A"
-	let g:wsdkinc=g:wsdkdir."\\Include"
-	let g:wsdklib=g:wsdkdir."\\Lib\\x64"
-	let g:wsdkbin=g:wsdkdir."\\Bin"
-	let g:Iwsdk=" /I\"".g:wsdkinc."\""
-	let g:Lwsdk=" /LIBPATH:\"".g:wsdklib."\""
-	"
-	"	OpenGL
-	"
-	let g:wsdkdir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A"
-	let g:glinc=g:wsdkinc
-	let g:gllib=g:wsdklib
-	let g:glbin=""
-	let g:Igl=" /I\"".g:glinc."\""
-	let g:Lgl=" /LIBPATH:\"".g:gllib."\" OpenGL32.Lib GLU32.lib"
-endfunction
-
-function! SetUpLibraries()
-	if has("win32") || has("win64")
-		call s:SetUpLibrariesWindows()
-	else
-		call s:SetUpLibrariesLinux()
-	endif
-endfunction
-
-call SetUpLibraries()
-
diff --git a/cpp/cf5-opt.vim b/cpp/cf5-opt.vim
deleted file mode 100644
index 0e2dbd1..0000000
--- a/cpp/cf5-opt.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-function! s:SetUpLibrariesLinux()
-	"
-	"	the root of all 3pty libraries
-	"
-	let g:srcdir=$HOME . "/src"
-	"
-	"	BOOST
-	"
-	let g:boostdir=g:srcdir."/boost_1_53_0"
-	let g:boostinc=g:boostdir
-	let g:boostlib=g:boostdir."/lib-amd64/lib"
-	let g:boostbin=g:boostlib
-	let g:Bboost=g:boostbin.":"
-	let g:Iboost=" -I".g:boostinc
-	let g:Lboost=" -L".g:boostlib
-	"
-	"	Intel TBB
-	"
-	let g:tbbdir=g:srcdir."/tbb41_20130116oss"
-	let g:tbbinc=g:tbbdir."/include"
-	let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-	let g:tbbbin=g:tbblib
-	let g:Btbb=g:tbbbin.":"
-	let g:Itbb=" -I".g:tbbinc
-	let g:Ltbb=" -L".g:tbblib." -ltbb"
-	let g:tbbmalloc=" -ltbbmalloc"
-	let g:tbbmproxy=" -ltbbmalloc_proxy"
-
-endfunction
-
-function! s:SetUpLibrariesWindows()
-	"
-	"	the root of all 3pty libraries
-	"
-	let g:srcdir=$HOME . "\\src"
-	"
-	"	BOOST
-	"
-	let g:boostdir=g:srcdir."\\boost_1_53_0"
-	let g:boostinc=g:boostdir
-	let g:boostlib=g:boostdir."\\stage\\win64_vc12\\lib"
-	let g:boostbin=g:boostlib
-	let g:Bboost=g:boostbin.";"
-	let g:Iboost=" /I\"".g:boostinc."\""
-	let g:Lboost=" /LIBPATH:\"".g:boostlib."\""
-	"
-	"	Intel TBB
-	"
-	let g:tbbdir=g:srcdir."\\tbb41_20121003oss"
-	let g:tbbinc=g:tbbdir."\\include"
-	let g:tbblib=g:tbbdir."\\lib\\intel64\\vc11"
-	let g:tbbbin=g:tbbdir."\\bin\\intel64\\vc11"
-	let g:Btbb=g:tbbbin.";"
-	let g:Itbb=" /I\"".g:tbbinc."\""
-	let g:Ltbb=" /LIBPATH:\"".g:tbblib."\" tbb.lib"
-	let g:tbbmalloc=" tbbmalloc.lib"
-	let g:tbbmproxy=" tbbmalloc_proxy.lib"
-	"
-	"	Win SDK
-	"
-	let g:wsdkdir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A"
-	let g:wsdkinc=g:wsdkdir."\\Include"
-	let g:wsdklib=g:wsdkdir."\\Lib\\x64"
-	let g:wsdkbin=g:wsdkdir."\\Bin"
-	let g:Iwsdk=" /I\"".g:wsdkinc."\""
-	let g:Lwsdk=" /LIBPATH:\"".g:wsdklib."\""
-	"
-	"	OpenGL
-	"
-	let g:wsdkdir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A"
-	let g:glinc=g:wsdkinc
-	let g:gllib=g:wsdklib
-	let g:glbin=""
-	let g:Igl=" /I\"".g:glinc."\""
-	let g:Lgl=" /LIBPATH:\"".g:gllib."\" OpenGL32.Lib GLU32.lib"
-endfunction
-
-function! SetUpLibraries()
-	if has("win32") || has("win64")
-		call s:SetUpLibrariesWindows()
-	else
-		call s:SetUpLibrariesLinux()
-	endif
-endfunction
-
-call SetUpLibraries()
-