Add simplecov and update jbuilder
Merge remote-tracking branch 'origin/master'