Merge pull request #21 from mbertrand/gn20upgrade-merge

Partial fix to base template, pavement.py & settings
Merge branch 'gn20upgrade-merge' of https://github.com/jj0hns0n/geonode into gn20upgrade-merge
Disable all haystack code (won't work anyway right now)
Pass user to layer_config (to determine if viewable)