Merge pull request #1 from techjeffharris/master

Updates, yo!
Merge pull request #2 from techjeffharris/master

Update package.json
Merge pull request #3 from techjeffharris/master

updates at your house, dude!
Merge pull request #4 from techjeffharris/master

privacy updates are operable!
packages.json updated!
Merge branch 'master' of https://github.com/iliketunes/off-the-record
Merge branch 'master' of https://github.com/adminion/off-the-record into adminion-master

Conflicts:
	package.json
Merge pull request #8 from iLiketunes/master

Updates And Shit