Updated gitignore
Bugfix: bootstrap now works again
Merge pull request #1 from hkirk/master

Merge