cleans up directory
fixes merge conflicts
Merge pull request #13 from rphuber/master

remove bower dependencies