Allow specifying an optional name for import-fn and import-macro

I apologize for the whitespace cleanup in this, if it bothers you I can try to do the PR without it.

Adds the ability to specify an optional name for importing something with `import-fn` and `import-macro`. Which allows using `import-*` for aliasing.