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 pull request #141 from BlueSpaceCanary/master

Master
Merge pull request #142 from BlueSpaceCanary/master

Dryrun works, and (fingers crossed) so does unicode-to-ascii
Merge pull request #143 from BlueSpaceCanary/master

Don't add more dorm rooms
Merge pull request #144 from BlueSpaceCanary/master

DormRoom's not a tuple anymore, take out that code
Merge branch 'master' into develop

Conflicts:
	ASHMC/roster/management/commands/scrape_roster.py
Added amazon affiliat stuff
Merge pull request #145 from BlueSpaceCanary/develop

Add amazon affiliate stuff and get back in sync with master
I swear that br tag was there...
Merge pull request #146 from BlueSpaceCanary/develop

I swear that br tag was there...
Caught one more dryrun get_or_create
Merge remote-tracking branch 'upstream/develop' into HEAD (amazon affiliate stuff)