Merge branch 'hotfix/0.6.6' into develop
Replace rvmrc with ruby-version
Try Ruby 2.0 again with Unicorn
fix a typo
Merge branch 'release/0.6.7'