Merging develop into master

.gitignore

@@ -1,8 +1,10 @@
 build_output/*
-code_drop/*
+build_artifacts/*
 *.suo
 *.user
 
+NDependOut/*
+
 src/logs/*
 
 **/*.sln*
@@ -22,5 +24,11 @@ _ReSharper*
 
 TestResult.xml
 submit.xml
-src/tests/*
+tests/*
 SolutionVersion.cs
+src/SolutionVersion.cs
+tests
+doc/build/*
+
+# osx noise
+.DS_Store

README.markdown

@@ -15,22 +15,38 @@ MassTransit is lean service bus implementation for building loosely coupled appl
 
 ## Getting started with Mass Transit
 ### Documentation
-Documentation is located at [http://masstransit.pbworks.com/](http://masstransit.pbworks.com/).
+
+Documentation is located at [http://docs.masstransit-project.com/](http://docs.masstransit-project.com/).
+
 ### Downloads
+ Download straight from NuGet 'MassTransit' [Search NuGet for MassTransit](http://nuget.org/List/Search?packageType=Packages&searchCategory=All+Categories&searchTerm=MassTransit&sortOrder=package-download-count&pageSize=10)
+
+ Download officially released builds from 
+ [Github](http://github.com/masstransit/masstransit/downloads/).
+
+ Download Nightly Binaries from [TeamCity](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt8&tab=buildTypeStatusDiv).
 
- Download Binaries from [TeamCity](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt8&tab=buildTypeStatusDiv).
+### Mailing List
+
+[MassTransit Discuss](http://groups.google.com/group/masstransit-discuss)
 
 ### Source
 
 1. Clone the source down to your machine. 
-  `git clone git://github.com/phatboyg/masstransit.git`
+  `git clone git://github.com/MassTransit/MassTransit.git`
 2. Run `build.bat`. NOTE: You must have git on the path (open a regular command line and type git).
 
+### Contributing 
+
+1. `git config --global core.autoclrf false`
+2. Shared ReSharper settings are under src/MassTransit.resharper.xml
+3. Make a pull request
+
 
 # REQUIREMENTS
 * .NET Framework 3.5 
 
 
 # CREDITS
 Logo Design by [The Agile Badger](http://www.theagilebadger.com)  
-UppercuT - Automated Builds in moments, not days! [Project UppercuT](http://projectuppercut.org)
+UppercuT - Automated Builds in moments, not days! [Project UppercuT](http://projectuppercut.org)

build.bat

@@ -1,32 +1,18 @@
 @echo off
 
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
+echo Building for .NET 3.5
+call rake all BUILD_CONFIG_KEY=NET35
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
-if '%2' NEQ '' goto usage
-if '%3' NEQ '' goto usage
-if '%1' == '/?' goto usage
-if '%1' == '-?' goto usage
-if '%1' == '?' goto usage
-if '%1' == '/help' goto usage
+echo Building for .NET 4.0
+call rake unclean
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+echo Creating NuGet package
+call rake nuget
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
-%NANT% %1 /f:.\build\default.build -D:build.config.settings=%build.config.settings%
+echo Create ZIP package
+call rake package
 
-if %ERRORLEVEL% NEQ 0 goto errors
-
-goto finish
-
-:usage
-echo.
-echo Usage: build.bat
-echo.
-goto finish
-
-:errors
-EXIT /B %ERRORLEVEL%
-
-:finish
+:FAILED