Add documentation about capistrano integration
Resolve merge conflicts
Include the currently logged in user with notifications