Merge pull request #655 from nicks/nick-cjsrequire

allow goog.require mixed with CJS, to address issues

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=77357076