More work done on MSBuild

Change-Id: Ia4620e22a1335ee56925e03296f5f89d63f81a2f
Reviewed-on: http://www.matthewh.me/gerrit/44
Reviewed-by: Matthew Hoggan <mehoggan@gmail.com>
Tested-by: Matthew Hoggan <mehoggan@gmail.com>