Added nuget goodness.
Merge remote-tracking branch 'refs/remotes/michaelnoonan/master'
merge again
fixed paths