Fix colorbar positioning when using 'axes' argument

The fourth argument of add_axes was using y1 instead of a width. Some cosmetic changes too
Merge pull request #301 from lesteve/fix-plotting-with-axes-argument

Fix colorbar positioning when using 'axes' argument