Switched both non_camel_case_type and non_uppercase_constants lints to warn

Updated copyright
Added changes of b64697d and dealt with rebasing issues