Merge remote-tracking branch 'hmslincs/dev' into dave-sean-dev
fix text for search column header
hold back django-tastypie; newer version requires django 1.5 libs
turn off escape so html formatting is allowed
comments
Merge branch 'dave-sean-dev' into dev
merge small formatting fixes in datasetdetail
Merge remote-tracking branch 'hmslincs/dev' into dev