Updated BSD file settings
Merge branch 'master' of github.com:castillar/ducking-octo-bear

Merging BSD changes