Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2 into testing
Merge branch 'master' of sda.sorrowind.net:/home/tracker/donations/tracker
Merge branch 'master' of git+ssh://github.com/uraniumanchor/sda-donation-tracker-2
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2 into testing
Added a 'select event' cookie setting page.  However, we should probably add something to the base page to show which event is current, and change the current event somewhere on the current page.
select event now works with the ajax filters
Merge branch 'master' of git+ssh://github.com/uraniumanchor/sda-donation-tracker-2
Add the AJAX selection widgets in more places
Default Runs and Prizes to the latest event
Added TODO.txt
Merge branch 'master' of git+ssh://github.com/uraniumanchor/sda-donation-tracker-2
Permissions
Added a prize spreadsheet generator
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2 into testing

Conflicts:
	admin.py
	prizesheet.py
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2 into testing
Complete re-structure of bids
- Bids can now be hierarchial, meaning you can can sub-choices beneath a root choice
- There is no longer any choice/challenge distinction, choices can have goals, and challenges can have options
- The UI parts of this will probably need some work, but at least from a functionality standpoint, it works.
Added the ability for donors to select their own alias, visibility, and contact e-mails.  Thouroughly untested however.
Fixed some parts of the filters to allow more descriptive URL searches
Added the ability for donors to set their alias, visibility, and email
Added a basic database fixtures generator
Fixed migration to allow null descriptions (as before)
Merge branch 'testing'

Conflicts:
	paypalutil.py
	views.py