Minor touchup to the Makefile
Merge remote-tracking branch 'origin/master' into makefile-touchup
Using the `test` make target in .travis.yml, plus adding target to the .PHONY list
Merge pull request #2 from modcloth/makefile-touchup

Minor touchup to the Makefile