diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..bdaa5ba982
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,50 @@
+*.doc  diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text=auto diff=csharp 
+*.vb text=auto
+*.resx text=auto
+*.c text=auto
+*.cpp text=auto
+*.cxx text=auto
+*.h text=auto
+*.hxx text=auto
+*.py text=auto
+*.rb text=auto
+*.java text=auto
+*.html text=auto
+*.htm text=auto
+*.css text=auto
+*.scss text=auto
+*.sass text=auto
+*.less text=auto
+*.js text=auto
+*.lisp text=auto
+*.clj text=auto
+*.sql text=auto
+*.php text=auto
+*.lua text=auto
+*.m text=auto
+*.asm text=auto
+*.erl text=auto
+*.fs text=auto
+*.fsx text=auto
+*.hs text=auto
+
+*.csproj text=auto
+*.vbproj text=auto
+*.fsproj text=auto
+*.dbproj text=auto
+*.sln text=auto eol=crlf
diff --git a/.gitignore b/.gitignore
index 5cf7c13c7e..2554a1fc23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,22 @@
 [Oo]bj/
 [Bb]in/
-*.xap
+TestResults/
+.nuget/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
 *.user
-/TestResults
-*.vspscc
-*.vssscc
 *.suo
 *.cache
 *.docstates
 _ReSharper.*
-*.csproj.user
-*[Rr]e[Ss]harper.user
-_ReSharper.*/
-packages/*
-artifacts/*
-msbuild.log
-PublishProfiles/
+nuget.exe
+*net45.csproj
+*k10.csproj
 *.psess
 *.vsp
 *.pidb
 *.userprefs
 *DS_Store
 *.ncrunchsolution
-*.log
-*.vspx
-/.symbols
-nuget.exe
-build/
-*net45.csproj
-*k10.csproj
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index c3b2462019..d54931bc8f 100644
--- a/build.cmd
+++ b/build.cmd
@@ -7,10 +7,9 @@ md .nuget
 @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '.nuget\NuGet.exe'"
 
 :restore
-IF EXIST build goto run
+IF EXIST packages\KoreBuild goto run
 .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-xcopy packages\KoreBuild\build build\ /Y
-.nuget\NuGet.exe install Sake -version 0.2 -o packages
+.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
 
 :run
-packages\Sake.0.2\tools\Sake.exe -I build -f makefile.shade %*
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*