Basic adaptation to be deployable
Merge branch 'master' of git://github.com/swanson/stringer

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of git://github.com/swanson/stringer
Merge branch 'master' of github.com:pedrocr/stringer