Docker and vagrant now work in harmony. Some refactorings for Ash's comments