Merge pull request #13 from xeno-by/master

heartbleed update
Merge pull request #14 from xeno-by/master

another shot at heartbleed update
okay this should do the trick
Merge pull request #15 from xeno-by/master

palladium hackathon 15 Apr 2014
Hackathon Apr 15, 2014
Merge pull request #16 from densh/hackathon/15-apr-2014

Hackathon Apr 15, 2014