Fixed test and travis
badge addded
rename gemspec
Merge branch 'master' into dev