Merge branch 'hotfix/20130310'
Merge branch 'release/20130312'
Merge branch 'release/20130312A'
Merge branch 'release/20130322'
Merge branch 'release/20130401'
Merge branch 'release/20130429'
Merge branch 'release/20130501'
Merge branch 'release/20130510'
added __unicode__ to hopefully make dorm appointments easier to manage
Merge pull request #132 from BlueSpaceCanary/master

added __unicode__ to hopefully make dorm appointments easier to manage
Oops, fixed names
Merge pull request #133 from BlueSpaceCanary/master

Oops, fixed names
Added dryrun to scrape_roster
Merge pull request #1 from ASHMCDevelopers/master

Master
that ain't python
Merge branch 'master' of https://github.com/BlueSpaceCanary/Webfront
Dryrun works, and (fingers crossed) so does unicode-to-ascii
Don't add more dorm rooms
DormRoom's not a tuple anymore, take out that code
Merge branch 'master' into develop

Conflicts:
	ASHMC/roster/management/commands/scrape_roster.py