Include config.mk in x86 Makefile

Necessary for specifying a good version of NASM on OS X (blame Apple)
Ignore files generated by eclipse
Remove previous makefile change

Apparently export works in config.mk