Merge branch 'master' of github.com:dukechronicle/chronline into photoshelter-resque