Update urls for Django 1.5
Update gitignore.  Added symlink.  Added multiplier to ingredient model.
Merge branch 'master' of github.com:SwampDragons/GroceryList

Conflicts:
	.gitignore