Add neat, fix whining configs
Merge Gemfile conflict.