Commit updates after running new openberkeley-dev.make
Merge pull request #71 from ucbklu/develop-run-makefile-2014-08-12

Commit updates after running new openberkeley-dev.make