Code fixes as requested by karai17
From #love on OFTC:
[Sep27/13 06:02:36PM] YHWH:	 az2yn: yo
[Sep27/13 06:03:04PM] az2yn:	 oy
[Sep27/13 06:03:20PM] YHWH:	 can you download that file and commit the code to my love und panzer repo?
[Sep27/13 06:03:27PM] YHWH:	 or send a pull request
[Sep27/13 06:04:40PM] az2yn:	 mm
Merge pull request #7 from mseymour/reqfixes

Restructured things to be less insane (part 1)