Fetch upstream and resolve merge conflict

This reason this failed yesterday was due to a merge conflicts in *resources.rb*.

/cc @jakeboxer for verification that the file is correct (I just took what was in `master` here).
/cc @jasonrudolph