Fixing up the .gitignore file from merge.
Fixing merge conflict on bluepill config.