Merge pull request #89 from tgrrtt/develop

Fixed travis for new repo name, using wiredep for index.html
Fixed travis syntax stuff