Updating makefile to reflect latest versions (May 7, 2013)