Moved all alerts to parent layout and removed chage contact info link if logged in as admin. Also added alert for deprecation of disaster edit url.
FIxed merge conflict and cleaned up some more code
Merge pull request #144 from nterry/master

Moved all alerts to parent layout and removed chage contact info link if...