changed to using puma
updated gems
Merge branch 'release/rel_20130813'