realign bower files
delete old files
realign bower files
delete old files
reinclude build comments in index
resolve conflicts
Merge pull request #7 from lindsbot/linds3

Linds3