Ignoring temporary VIM files.
Clone of adminlock functionally working.
Resolving merge conflict.