Put vendor into .vendor, and remove chrome frame
Merge in master