Updating deps
Oops, missed this update
Simplifying travis yml
Merge pull request #7 from modcloth/update-deps

Update deps
Merge remote-tracking branch 'origin/master' into cloning-recursively

Conflicts:
	.travis.yml
	Godeps