pull to 20130301
Merge branch 'master' of https://github.com/cdlib/RecordExpress