Squashed commit of the following:

commit eee0470baf497f6ceb67b9d9c069bc272e5592c6
Author: Sean Baskin <seanbaskin@gmail.com>
Date:   Mon Mar 17 13:16:25 2014 -0400

    Setup filestore