Merge pull request #8 from m1keil/master

add handling both vagrant 1.5 and 1.6
typo corrected

unlikely to change your day but anyway...
Merge pull request #11 from ametcalfe/master

typo corrected
updating all templates with vagrant 1.6 support
adding support for vmware builder