Silly merge
Merge branch 'master' of github.com:Aslai/Coldstormd
Finished off ignore, other small things