Merge branch 'replace-deprecated-functions' from Connor's changes

Conflicts:
	WPRavenAuth.php -> mine
Fix syntax error.
Merge pull request #2 from Burgch/patch-1

Fix syntax error.
Merge remote-tracking branch 'upstream/master'