Add travis badge to readme file.
Resolve merge conflicts.
Change name of plugin to underscored plugin name.