Correctly align both narrow and wide figures.
use ordereddict as fallback
Fix figure width when not specified.
Merge remote-tracking branch 'origin/master' into 2013

Conflicts:
	publisher/writer/__init__.py
Paper: HPC Visualization.