whoops - switch to HH syntax
Merge branch 'vendored' into heroku