Consistant Pulsestorm (vs. PulseStorm)
Merge branch 'master' of github.com:astorm/Pulsestorm

Conflicts:
	README.markdown
	WHA_HAPPENED.md
Merging: Still awful at it