According to  http://getbootstrap.com/css/#grid-intro
the proper way to get a full page layout is to use container-fluid
but a normal row, which has negative margin to undo the padding.

It's all very confusing; but this feels better than my first effort.

The container-fluid div appears to be superfluous in Bootstrap 3.1+
so I have removed it, and with it goes the 15px margin.

Resolved conflicts:
	django/website/local_settings.py.jenkins

...so that bootstrap building does not fail on syntax error anymore.

This eliminates warnings about the default value for this attribute
changing.

The default branch on staging was set to 'master'. This led to the
staging server not working because the wrong branch had been deployed.