Updated Nacl instructions and Makefile.

Not defining NATIVE_CLIENT_<arch>_INCLUDE was causing really unhelpful errors.
Merge branch 'master' into nick-sandbox