astyle'd
made travis less shit
Merge pull request #87 from gtorrent/astyle

astyle'd
merged master; fixed conflicts