some alts for tours & tour page
some home feature tests become green, some lyouts fixed
database_cleaner back again
some rubocop
Merge pull request #34 from dmitryshilin/go-go-go

Go go go
fixing merge conflict