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 pull request #145 from BlueSpaceCanary/develop

Add amazon affiliate stuff and get back in sync with master
Merge pull request #146 from BlueSpaceCanary/develop

I swear that br tag was there...
Merge remote-tracking branch 'upstream/develop' into HEAD (amazon affiliate stuff)
Merge branch 'develop' of https://github.com/BlueSpaceCanary/Webfront into HEAD
Fixed missing :'s