First pass at making dependencies / conflicts consistent. Also added VCS browser info.