Resolved conflicts:
	django/website/hid/tables.py

Was getting:

~/workspace/internewshid/django/website➔ ./manage.py --version
/home/marks/workspace/internewshid/django/website/data_layer/models.py:11: RemovedInDjango19Warning: Model class data_layer.models.Message doesn't declare an explicit app_label and either isn't in an application in INSTALLED_APPS or else was imported before its application was loaded. This will no longer be supported in Django 1.9.
  class Message(DataLayerModel):

/home/marks/workspace/internewshid/django/website/data_layer/models.py:11: RemovedInDjango19Warning: Model class data_layer.models.Message doesn't declare an explicit app_label and either isn't in an application in INSTALLED_APPS or else was imported before its application was loaded. This will no longer be supported in Django 1.9.
  class Message(DataLayerModel):

1.8.2

'transport' app imports 'data_layer' so changed their order in
LOCAL_APPS

Conflicts:
	django/website/hid/views.py
	django/website/media/css/styles.css
	django/website/templates/base.html
	django/website/templates/registration/login.html

Still need to handle row numbers correctly

Includes a hacky fix to skip ignored values and a temporary hardcoding
of the sheet profile.

normalize_row doesn't really need to dealw ith None
and theres a slightly more elegant way to calculate row numbers

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.

Google CSV to XLSX conversion results in dates being stored as date objects
rather than strings, so we need to cope with these

Conflicts:
	django/website/templates/base.html

http://doughellmann.com/2012/11/12/the-performance-impact-of-using-dict-instead-of-in-cpython-2-7-2.html

Because not all sources might offer one