Merging in a basic bootstrap + Angular project skeleton