Update setup.sh
setup.sh now installs pip
$$$
edited README.md to include ./start.sh to start server
setup.sh is slightly more hesitant
making changes to import page views
test
testing menu header
re-added header-links.html
added links header to import/index.html
edited header-links to check for import
edited import/index.html to put the header on top
edited header-links to check for import
edited import/index.html to put the header on top
edited path definitions on header-links.html
Merge http://github.com/welred/asset-manager

Conflicts:
	assets/assets/templates/header-links.html
	assets/assets/templates/import/index.html
$$$
maybe this time the header-links will draw as their own block...
ok this time for sure
added titles to views.py and to generic/model.html
titles
removed titles from asset forms