Updated packages and ensured project transitioned to VS2012
merge of master and minor updates
code clean up