merge and fix gitignore
???
grrr
Merge remote-tracking branch 'origin/master' into nick