.gitignore should probably not ignore all the important things
Merge branch 'master' of https://github.com/horak/trigger-happy