Bootstrap and some project stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Removing ignore file for now.