Revert "more stuff"

This reverts commit de26095057a52dcc9144b25e1ff9d49bcbaf21d4.

Conflicts:
	Gemfile