Change tight_layout commands to avoid errors on Mac OSX

See the following links for more info:
https://github.com/matplotlib/matplotlib/issues/2654
https://github.com/matplotlib/matplotlib/issues/1852