Added favicon, fixed travis tests.
Merge remote-tracking branch 'origin/master'