Merge boilerplate, bootstrap and personal changes