Update authorized_keys
Resolving merge conflict w/ Nielsen
Merge branch 'niven01-master'