cleanup gemfile
Made readme more general
Merge branch 'master' into develop

Conflicts:
	Gemfile
Merge branch 'develop'

Conflicts:
	Gemfile