Add attributes to allow for external user authentication; change local_settings.py.erb to work with new attributes
rubocop style fixes, for consistency
merge changes from @sdadh01 for #128
Merge branch 'sdadh-1-master'

Conflicts:
	attributes/default.rb