First full commit
Get rid of vendor.css
Get rid of bower directory in dist
Fix merging conflicts