Fix includegraphics using default keys

Instead of redefining \includegraphics in LateX and beamer templates, the
preambles now use the graphicx \setkey system.

I believe it solves the graphicx problems for PR #26 and #28