Merge pull request #75 from gtorrent/wip/use-settings

Fixes a bunch of things.
Merge pull request #78 from gtorrent/wip/use-settings

Implement settings.
Update addmagnet.sh
Fixes the issue where gtorrent.lock is checked for even if the directory
doesn't exist.
Fix bullshit headers
Merge pull request #84 from gtorrent/wip/fixheaders

Fix bullshit headers
Merge pull request #83 from lluixhi/master

Fixes the issue where gtorrent.lock is checked for even if the directory doesn't exist.
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