Add boot2docker config
Fix merge conflicts