Merge branch 'release/20130510' into develop
Added __unicode__ to hopefully make dorm appointment management easier
Merge pull request #131 from BlueSpaceCanary/develop

Added __unicode__ to hopefully make dorm appointment management easier
oops, fixed names
Merge pull request #134 from BlueSpaceCanary/develop

oops, fixed names
Added dryrun to scrape_roster
Merge pull request #139 from BlueSpaceCanary/develop

Added dryrun to scrape_roster
that ain't python
Merge pull request #140 from BlueSpaceCanary/develop

that ain't python
Merge branch 'master' into develop

Conflicts:
	ASHMC/roster/management/commands/scrape_roster.py
Added amazon affiliat stuff