removed insanity
merged master; fixed conflicts
Merge branch 'master' into var-names
Fix reference to std::string
Merge pull request #88 from gtorrent/var-names

removed insanity