refactored away bower
Adding the latest changes