Finnish language, plus removal of .old files
Merge branch 'master' of github.com:rmcauley/rainwave
Removal of another old file
Merge remote-tracking branch 'upstream/master'

Merge with latest upstream
Modified gitignore to ignore temp files and fixed conflict