Rebase 20140717

@antoviaque @aboudreault seems like this rebase (with the appropriate Ruby dependency update) works on the QA environment. Seems like we should complete this merge of the rebase, no?

@fredsmith, FYI