Merge branch 'merge_from_svn' into 'master'

Merge from svn

Merge-in the changes I made to speed things up a bit in the sorted interactions. Was committed to SVN first because I missed Peter's mail regarding the new repository, using it to practice using git now ;)

See merge request !1