updated gitignore
Merge branch 'feat-django'

Conflicts:
	.gitignore
updated chef cookbook for vagrant env