Removed some packages from bower
Fixed conflicts