Improved README
Improved documentation
Fixed some config
Merge branch 'fix/change_config'

Conflicts:
	Gemfile.lock
fixed spec
Added travis.yml