syncing from frodo
Merge branch 'master' of https://github.com/tmtowtdi/LacunaWaX
gitignore edit