Adding changes plus berks stuff plus vagrant stuff
Adding changes plus berks stuff plus vagrant stuff
merged changes