nilavu.yml
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	Gemfile.lock
Avoid [] nil method error when rails loads and nilavu.yml doesn't have some values