Removed and cleaned up duplicate code.

Fixed up nuget package generation
made auto incrementing build numbers.