merge pull reqeust
correct .gitignore
revert .gitignore
set up karma conf for CI
Update readme.md
update bower