Chef 11.10 compat

WindowsPackage was not introduced until Chef 11.12, meaning we can
delete it to make the Chef 11/12 windows_package hack work
Added Chef 11.10.4 to kitchen.yml
Switch kitchen-vagrant to afiune's branch

My minor patch has been merged, so let's reduce the number of branches
out there by one.