updating ruby
updating flow
Merge branch 'hotfix/V1.2'
updating unicorn conf to not timeout
Merge branch 'hotfix/V1.2.1'