Ignore bower components
Merge updates