Syri partcoded

Syncing up here so I can grab it on my laptop to fiddle with.
Merge branch 'master' of https://github.com/Fenoxo/sourceTiTS
Syri Rough Code

Prolly doesn't compile, so don't include it. Will polish it up on my
desktop later.
Merge branch 'master' of https://github.com/Fenoxo/sourceTiTS
Merge branch 'master' into itemversioning