Make core reuse pipe
Fixed a small conditional statement.
And removed an unused method.
astyle'd
removed insanity
python -> C++
made travis less shit
Merge pull request #87 from gtorrent/astyle

astyle'd
merged master; fixed conflicts
undo what somehow kills both compilers o_O
Merge pull request #89 from gtorrent/rm-cpplint

python -> C++
Merge branch 'master' into var-names
Fix reference to std::string
Merge pull request #88 from gtorrent/var-names

removed insanity
tab
Merged master into wip/use-settings
Merge branch 'wip/use-settings'
merge