added .idea/workspace.xml to ignore list
Merge branch 'foreignTorrents'
Added -Xmx512m to surefire plugin opts to prevent OOME
changed logging level to INFO
Merge branch 'master' into foreignTorrents