Merged 2.1 development into master

.gitignore

@@ -1,5 +1,6 @@
 build_output/*
 code_drop/*
+log/*
 
 **/*.suo
 **/*.user
@@ -10,14 +11,13 @@ _ReSharper*
 
 *.csproj.user
 *.resharper.user
-*.resharper
-*.ReSharper
 *.cache
 *~
 *.swp
 *.bak
 *.orig
 
+
 TestResult.xml
 submit.xml
 src/tests/*

README.md

@@ -1,35 +1,39 @@
-Topshelf - A service hosting framework for building Windows services
-=======
-
-# LICENSE
-
-Apache 2.0 - see LICENSE
-
-# IMPORTANT
-
-NOTE: If you are looking at the source - please run build.bat before opening the solution. It creates the SolutionVersion.cs file that is necessary for a successful build.
-
-# Mailing List
-
-[Topshelf Discuss](http://groups.google.com/group/topshelf-discuss)
-
-# Source
-
-1. Clone the source down to your machine. 
-   `git clone git://github.com/Topshelf/Topshelf.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/Topshelf.resharper.xml for formatting and style
-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)
+Topshelf - An easy service hosting framework for building Windows services using .NET
+=======
+
+# LICENSE
+Apache 2.0 - see LICENSE
+
+# IMPORTANT
+NOTE: If you are looking at the source - please run build.bat before opening the solution. It creates the SolutionVersion.cs file that is necessary for a successful build.
+
+# INFO
+## Overview
+Topshelf is an awesome service host for windows services.
+
+## Getting started with Mass Topshelf
+
+### Mailing List
+
+[Topshelf Discuss](http://groups.google.com/group/topshelf-discuss)
+
+### Source
+
+ 1. Clone the source down to your machine. 
+   `git clone git://github.com/Topshelf/Topshelf.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/Topshelf.resharper.xml for formatting and style
+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)