removed travis deploy, merged doubled stylesheets, fixed typo