added width to context and rejuggled configuration a bit

Configuration update should be more or less backwards compatible, since we use the 960 grid everywhere anyhow

@alesdotio you ok with this?