Squashed commit of the following:

commit 5fd0512aeafdc153188479b72301b113478a544a
Author: Kevin Sawicki <kevinsawicki@gmail.com>
Date:   Wed Jun 12 11:12:04 2013 -0700

    Use correct pluralization of files in ok message

Closes gh-13.