Fix conditionals, fix indenting
Update gemfiles