Merge pull request #1 from hennevogel/master

Some minor fixes/features
Add the miratons from the conf.o.o live instance
Merge pull request #2 from hennevogel/master

Last stuff from the live instance
Ignore some config files, update rails version in Gemfile
Adapt Gemfile* to what's available in OBS:Server:2.4
Merge pull request #3 from hennevogel/master

Adapt dependencies
Merge pull request #8 from openSUSE/master

Merge what happened on the live instance