codes for django 1.5 compatibility

Signed-off-by: Roy Storey <roy.storey@plantandfood.co.nz>
correct comment missed when editing the autogenerated files from django

Signed-off-by: Roy Storey <roy.storey@plantandfood.co.nz>
path based on value of LAVAFLOW_ROOT env variable

Signed-off-by: Roy Storey <roy.storey@plantandfood.co.nz>
Merge branch 'feature/django-1.5' into develop