Update to 4.6

-contains fixes needed for input mapping to work in 4.6
-NB: suppresses warning C4273
Warning Fix

-No longer suppresses C4273
Merge pull request #10 from getnamo/master

Update to 4.6